From: Jonas Dreßler <verdre@v0yd.nl>
Date: Thu, 23 Jan 2020 22:26:45 +0000 (+0100)
Subject: theme: Move caps-lock warning to entry widget stylesheet
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~93
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=eee0657727232e90b1af8127db30d4bf80c45703;p=gnome-shell.git

theme: Move caps-lock warning to entry widget stylesheet

The caps-lock warning is more related to entries than dialogs and is
also used in gdm, which is not realated to dialogs at all. Rename the
css class to caps-lock-warning-label and move it to the entry
stylesheet.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/952
---

diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index bd49e7393..f1960dba7 100644
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -133,11 +133,6 @@
   padding: 8px;
 }
 
-.prompt-dialog-caps-lock-warning {
-  @extend .prompt-dialog-error-label;
-  padding-left: 6.2em;
-}
-
 
 /* Polkit Dialog */
 
diff --git a/data/theme/gnome-shell-sass/widgets/_entries.scss b/data/theme/gnome-shell-sass/widgets/_entries.scss
index 0a43e86f3..70875b085 100644
--- a/data/theme/gnome-shell-sass/widgets/_entries.scss
+++ b/data/theme/gnome-shell-sass/widgets/_entries.scss
@@ -25,3 +25,9 @@ StEntry {
     color: transparentize($fg_color, 0.3);
   }
 }
+
+.caps-lock-warning-label {
+  padding-left: 6.2em;
+  @include fontsize($base_font_size - 1);
+  color: $warning_color;
+}
diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index 77e3a185b..f8f2f12fd 100644
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -156,7 +156,7 @@ function addContextMenu(entry, params) {
 var CapsLockWarning = GObject.registerClass(
 class CapsLockWarning extends St.Label {
     _init(params) {
-        let defaultParams = { style_class: 'prompt-dialog-error-label' };
+        let defaultParams = { style_class: 'caps-lock-warning-label' };
         super._init(Object.assign(defaultParams, params));
 
         this.text = _('Caps lock is on.');